Added conditionals activity