prepare for upgrade release
prep refactoring