Made some changes bud