tweak to conditionals