Merge changes from Charlie and Regis and revise conclusion