Made the file self-contained