updated initial setup routine