Added a few adjustments