Merging new code