Added uncertanty checking