minor old changes
next round of changes post-invite