Updated amalgamated files