Added non-working conditionals