Restructured movement to check for special