reverting back a couple unintended changes