Add validation for crpyto 1
Fix Merge Errors