Improved Checking