Slightly improved performance on sample by 1ms