Additional changes from Pr/5

Merge my changes for pr/5