merged, changed johns number to mine