expanded map and added more objects