improvements in conditional