Updated in class code