Check win refactor