changes from last week WIP!