update to deal with differentiated scene and window.