Andy's merge 11-17