Reorganisation
param tweak
Remove bad assert