Some other changes for reverting