Make size to be CROSS aware