Modifications according to review comments
merged