SafeMovement improved