updated for A2