Update to Bill's latest corrections of subway