Reworked A2 to correct errors