More work on print_token