Added back in the manual socket code