upgrade to Aeoropike 3.3.22 and AMC 3.4.7