added some missing stuff