Changes according to some of Frank's suggestions.