More modifications to preview