A bit more work on (#40)