update is working now, but not fully tested