adjust config and change code