Changes for production-ready yay