not fan of separating the two cases.