Added NPC movement