conditionals now work