LILY-310: update after review