Adding smooth movement
Some changes