Collision detection with NPC's added