changes for preview and monitoring