Simplify & fix parameters
Actually fix parameters
Swap to  for consistency