had to make some changes