more changes
introduce makeClass()