reverting back to working changes from merge

reverting back to working changes from merge