made some necessary changes