updated for preview.8