better networking handling