Once again change config splitters etc.