incorporate tom's changes