Still not convinced the second part of this conditional is needed.