Reworking setup process again.