Slightly better size calculations