Updated preview to cope with the latest set of changes