Added Q5, updated Q2