added in currentClass loading.