some missing stuff from last commit