Added Guard back to production