added Q3, modified Q2