added second source (WHO) + master/detail interface