reworking some of the configuration steps