refactored Samples