update to our own maintained branch