Edited map-tools: