Updated set up