Made some essential changes