restoring some stuff that seems to have been lost.