Add Fool-proofing