Revision 7.1

First step towards enemy NPC's