added back the some of the previous class