Nick O: Updated sample to thundr 2.0