docbugs round 1: levinson's changes