puzzle stuff, AA fix