Updated to reflect windows status