+separate ways into buildings and ways
+added