updated to accommodate mapview