change Lazy implementation