[Issue #5] updating as per review suggestions