The last change that Mihaela asked me to incorporate now - addressing issue: https://git.scicore.unibas.ch/zavolan_group/pipelines/rhea/issues/77
