Updated Setup Script