Made necessary changes