Reworked Code