Even more work on improving sim v2 to use Sueur model