more changes to A.java