Finalized changes for A1