unused if None because of the double if?
we should also save the attribute if not?