#30: get rid of Suite, stay with Session