ECDH added and more pleasing aesthetically