last minute changes to work with popcorn