Fix and Code

Fix&Code