Continued work on maps