Some changes at preview creation
Some changes at preview creation