Working changes. Except for the map.