Made a few adjustments