Fix propagation code.
Add field unraveling code.