merged tom's stuff with mike's stuff