Fixed up to look more like is required for class.