get rid of window && new version