Modified to allow instant previews