modifications per Phil's request