Make it self-contained