misc: bring back some