added more complete context-tracking to client regions