Changing setter logic