Use better configuration option. part 1.