modifications about class name and update