Check-in before refactor