changes for non-team modes