Update math, algorithm from develop.