updated to class of 2018