setting rework

Change-Id: Ife7b20b0083ba31ad414a2e593d305318406a81e