Comcast is changing its Xfinity plans nationwide to make them simpler – and it’s dropping data caps so that the plans have truly unlimited data.

The company announced today that it will now offer four plans – 300 Mbps, 500 Mbps, 1 Gbps, and 2 Gbps – across three different pricing tiers: an “Everyday Price” paid per month without a price guarantee, a lower price-per-month with a one-year price guarantee, and a price-per-month with a five-year price guarantee that’s slightly more expensive than the one-year option.

The plans will include unlimited data with no data caps, spokesperson Joel Shadle confirms to The Verge. They’ll also come with an Xfinity WiFi Gateway and a free line of Xfinity Mobile cellular service for one year. If you’re currently on an Xfinity plan that’s not one of the four tiers, you can stay on it until you repackage your plan, spokesperson Rachel Zabinski Williams says.

These updates follow Comcast’s announcement of the five-year price lock option in April. Comcast also recently started rolling out “ultra-low lag” technology in certain cities that could lower latency when using things like FaceTime or Nvidia’s GeForce now.

(Disclosure: Comcast is an investor in Vox Media, The Verge’s parent company.)