Changed to a regular Window VS SurfaceWindow
refactored