Added data2 to keep day groupings. This is a transitional fix.