Made examples work according to the changes