Updated finalized changes to meet requirements