Jeff's changes