Need to make a few adjustments