Fixed A1 stuff. continuing work on A2