3rd pass at #69