change dow mappings and todo's