WIP
Fixing Trannoy-Wasmer reform (to complete)