Fixed Setup Script