complete rewrite to match new adaptor loader