Adds another common error, minor rearranging of samples.