Go closer to be production-ready