add SAMODE support