Even more updates for preview