handling more cases