some changes some things not working