Also check on window switch..