Updated until todays class