Missing half of the parameters and tweaks for consistency