Detection test, smoothed removal, setter modified, samples corrected