2nd pass at #69