Added preview capability