Incorporated feedback from @doll.