some changes again