Some tabulation added