Reviewed tiny part of r/2664