Merging in current code