Merged in code from another project