Made a few adjustments for project requirements