initial upload
Add Fool-proofing code