Result after merging Gavin changes in.