Changes to responsibilities per Frank's suggestions