Fixed things so they time without copy