updating to include maps