cleaning up, added lmap2