Reworked Logic