Fixed Proposed Changes After Review