Merging Susans changes