merged jim's special branch for redirecting to production