Sample improvements