added some missing pieces