added crypto
merged