Fix HPS and start rebuilding the window