Added back some missing things --from 3.0 still wip