edited for class