Renamed and changed to listener socket