updating to match new classpaths