complete some of Class section