loads of changes, mainly to self-sustained activity models