Reverting Check Routine from this branch