added missing stuff from previous commit