modified Setup Script