more alignment with tim's spreadsheet
more alignment with tim's spreadsheet
Resolving the conflicts