Updated samples based on latest (3/25) code