Updated to use new map system :D