Another go at #6