changed if conditionals again