Started Code Reworking