Initital version of the revert back to oringial format