Continue the decoupling