22.3 - edits to #33 and 34