move stuff from private