change identifiers
remove identifier
add client connection timeout mechanism