added AMD/module support.