Took care of item 3 in #74