part of #199/2