Made changes to set up the final configurations