updated - still needs fixing
updated and made changes to the class file