Rebuild class to add preview