added some missing stuff back in