Changes to get to base sample