Moved stuff to raw_to_tape