added more cases'