Merging in new code