implemented lazy mode for production environments