making deeper compability with AM