huge update, split config