fixed to new parametrisation