made a few adjustments for me