More work towards getting the user multiplexing right