Updated amalgameted files