Q2 refactoring