Map changes almost done