add ordering properties and better handshake seq logic handling