more preparation for major reset