some changes to stuff