tweaks to remove dependencies on whether this is the first sample or not