change to autoloader (per Doug L.)