missing some conditionals