first pass on #231