additional mods to combine w/ Warren's code