Changes for class

Made changes to include new functionality