Merge with Susie's changes