Changed movement to be diagonal friendly