Updating to current setup