modified the way the classname is set