conditionals final commit

final commit