Refactor for lazy

can you update this to be `Public`?