LILY-302: Update after review