some changes from a while ago