Got rid of some deepcopy()'s