Adam's audiowrappers into official cm