Modernized, adjust launch timing to occur after window setup