Second pass at #96