less lines
Nextmap fixed