removed multi-way if