Added better movement