Made changes for a new 'preview' state