Tweaking preview logic