Simplify one to one management