ugly update to allow Crime and renegotiation