Updated to work with refactored CS290GECC