updated and ready for prod