Improvement on Check functions