crypto
john's merge