Added more cases