Changes for Final Deployment