Changes per feedback from Miranda & Ellen