Do Q2.3 and fix Q3