Disney will be removing its smoking areas at its theme and water parks in California and Florida. The new policy will also take effect on ESPN Wide World of Sports Complex beginning on May 1.

Smoking areas will now be placed outside the park’s entrances and selected entertainment areas. Smoker and vapers may also indulge in designated locations at Disney Springs in Florida, or those who have dining or reservations may still smoke at specific areas in Disney Resort hotels.

The House of Mouse said in a blog that as they expand their offerings, they would continue to take steps to improve the guest experience and make each visit more enjoyable for everyone.

Disney is preparing to open its new Star Wars-themed parks in California this May 31, and in Florida later this year on Aug. 29. Called Galaxy Edge, the new attraction is expected to entice many visitors. The company aims to reduce overcrowding within the current parks.

Other stricter regulations will also be implemented on May 1 which includes banning of loose or dry ice. Cooler or cooler bags may now only be loaded up reusable ice packs. Disney is also restricting stroller sizes to 132 cm long and 79 cm wide while stroller wagons will no longer be allowed.