Final updates for class.