new map and bug removal