Updated TODO for production