updates following #202