Stripped out the existing checks and left one sample one in.