some modifications to get working on both Tim's and Jeff's machines