re-add some stuffs that got lost during merge