Fine tuning on the already merged branch issue40 from MR38

Trageserrequested to merge
finetuning_MR38 into main

Implemented/Implementing further comments from MR38

Merge request reports