add another 2 cases