More organization of callbacks. Decoupling.