Fixed and updated the whole configuration