Updated sample mode