start of better movement and resahpe func added