updated w/ new columns based on discussions with DW team