Peggy's changes