NEW YORK (CBSNewYork) — Using your cell phone and checking your email is about to get easier on the subway system.

The Metropolitan Transportation Authority is planning to add Wi-Fi service to 40 subway stations in Queens sometime next year as part of a seven-year plan to outfit the entire subway system with the service, CBS 2 reported.

Currently, the only stops with Wi-Fi are in Manhattan at 23rd Street on the C & E platform, the 6th & 8th Avenue L stops and 14th Street, at the 1, 2, 3, F, M, C, E and A stops.

AT&T and T-Mobile signed 10-year contracts to provide cell and Wi-Fi service through a network being built by Transit Wireless.

Other carriers have been negotiating deals.

All underground stations are expected to be wired by 2018, but trains were not expected to have service between stations.