clumped the various options with or without x into a single conditional