Made some good changes