Simplified running the samples a bit