back to old wiht a few fixes