the rest of the merge of the new preview