A lot of changes to config