More preview logic added.