Also updated examples