David's modification of Jeff's file.