Tons of changes for set up