reverting to previous
fixed errors from revert
merge