Another shot at production deployment