Adjusted computations such that they should work correctly with the new sizes