updated for 1.5.2
more config refactoring