More updates for preview