improved settings

Change-Id: Ibd3e5f214c35dcb65334bcf5df6f0948e695fd4f