Refactored samples