#135 Considerable map progress