revert back almost everything