edit to main window & resolver