Smoth moving and some code added