Add Make and Preview function