Incorporate feedback #5

Closed korenmiklos closed 2 years ago