updated for preview