w/ Jeff's changes