Update flyweight, math from develop.