Improved waste example