removed extra IF