Incorporating comments from Edmondas