Reworking setup process.