added updating map, this is godawful design