Use better configuration option. part 2.