added some missing pieces again