Hopefully improved some networking