Updated set up script