Changes for class.