added some loose bits