Updated setup script (not yet tested)