Completed if, else, ternary -updated