Energy Drink Logic Improved