Mostly working - still some potential for failures, but adequate