reverting some code so names match up
patching code