Quite severe commit to enable scaling based on body size. Major breakage ahead!