Fancy schmancy improvements to the way the sizes are calced