I will change this so that here, it is overridden only if not set. Does that suit?