Updated preview creation algorithm