Updates in prep for map