adjust to problems found in Debbie's demo