Merging Paul's Changes