Update flyweight, geometry from develop.