Merge Pauls changes