Updates for initial copy take two.

First try didn't seem to take.