reworked nextmap