Incorporating second round of comments from Edmondas