class modifcations done