Add boundary check -> move alone path