even made config neater