first pass at #421