Included all Raymer functions in the weight calculation.