added conditionals assignment