add the missing stuff from last commit