Made changes to the way 'samples' works