also make some changes