added bridge and roundabout too