more consolidation
change to add time column
rename constant