bring it totally inline with 8580daa source