rename variable and put the key exchange option back in