Reverting mostly back to original