Adding boundary box and better movement