updated samples to follow latest changes