Added validation of movement