Updates to the preprocessing to ensure that the necessary parameters are being calculated