changes made for testing autoloader will work on during the week