Third pass at #96