Rewrote part of mapHandler to homologate code base. Upped version number