Modified setup scripts