modify Set method