This is the edited version for class