Refactored by moving the emitters from sockets