Updated with A2 Q1