Poppy's Upgrade. .. Could be improved upon