better conf

Change-Id: I2ba11fdc9308661cf03b18c7923310b82e6f9077