Updates to class three