Adding shared memory changes from Todd