Changes to collect samples