Added preview mechanism