Include changes/modifications discussed at the last scattering meeting (17/May/2018). Please all: revise the spreadsheet and comment!