Some of Frank's modifications.