added amalgamated files as well