updated conditionals view