Added jeremy’s class