orig: updates from review