John Rickard window-upgrade1504