update from @BioMath