minor edits with ability to preview