Making some necessary changes