manged the class section to adapt to our scope