UNTESTED improving config