fix intervals and add by the end of .....
Merge remote-tracking branch 'upstream/develop'
pruned duration-hence def: use in-duration instead