original_query: What were the main components of the transit-oriented plan?
query: What were the main components of the transit-oriented plan for Toronto's transportation?
answer: The transit-oriented plan included the Eglinton Avenue and Queen Street subways, extending the Spadina subway north to Vaughan, and extending the Bloor-Danforth line east into Scarborough.  It also included express bus routes along the expressways and commuter rail. The inner ring of highways was not included.