Updated setup scripts
Updated setup scripts