Subway Problem Improved