Handle move input more betterly