updated for autoloader