Prevent double calcs and more tuning