10232014 Maptool Improvement