updated to add map