diff --git a/.travis.yml b/.travis.yml
index a0f6849..7efd05a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,72 +1,67 @@
 language: c
 sudo: required
-dist: trusty
+dist: xenial
 compiler: gcc
 os: linux
 
 env:
-    - t=aarch64-danio-linux
-    - t=alpha-danio-linux
-    - t=arm-danio-eabi
-    - t=arc-danio-linux
-    - t=c6x-danio-linux
-    - t=parisc64-danio-linux
-    - t=parisc-danio-linux
-    - t=i386-danio-linux
-    - t=i686-danio-gnu
-    - t=ia64-danio-linux
-    - t=m68k-danio-linux
-    - t=microblaze-danio-linux
-    - t=mips64-danio-linux
-    - t=mips-danio-linux
-    - t=powerpc32-danio-linux
-    - t=powerpc64-danio-linux
-    - t=s390-danio-linux
-    - t=sh2-danio-linux
-    - t=sh4-danio-linux
-    - t=riscv32-danio-linux
-    - t=riscv64-danio-linux
-    - t=sparc-danio-linux
-    - t=sparc64-danio-linux
-    - t=x86_64-danio-linux
-    - t=xtensa-danio-linux
-    - t=nds32le-danio-linux
-    - t=or1k-danio-linux
-    - t=hexagon-danio-linux
-    - t=am33_2.0-danio-linux
-    - t=bfin-danio-linux
-    - t=crisv32-danio-linux
-    - t=frv-danio-linux
-    - t=m32r-danio-linux
-    - t=tilepro-danio-linux
-    - t=tilegx-danio-linux
+ - t=aarch64-danio-linux
+ - t=alpha-danio-linux
+ - t=arm-danio-eabi
+ - t=arc-danio-linux
+ - t=c6x-danio-linux
+ - t=parisc64-danio-linux
+ - t=parisc-danio-linux
+ - t=i386-danio-linux
+ - t=i686-danio-gnu
+ - t=ia64-danio-linux
+ - t=m68k-danio-linux
+ - t=microblaze-danio-linux
+ - t=mips64-danio-linux
+ - t=mips-danio-linux
+ - t=powerpc32-danio-linux
+ - t=powerpc64-danio-linux
+ - t=s390-danio-linux
+ - t=sh2-danio-linux
+ - t=sh4-danio-linux
+ - t=riscv32-danio-linux
+ - t=riscv64-danio-linux
+ - t=sparc-danio-linux
+ - t=sparc64-danio-linux
+ - t=x86_64-danio-linux
+ - t=xtensa-danio-linux
+ - t=nds32le-danio-linux
+ - t=or1k-danio-linux
+ - t=hexagon-danio-linux
+ - t=am33_2.0-danio-linux
+ - t=bfin-danio-linux
+ - t=crisv32-danio-linux
+ - t=frv-danio-linux
+ - t=m32r-danio-linux
+ - t=tilepro-danio-linux
+ - t=tilegx-danio-linux
 
 jobs:
-    include:
-        - script: |
-            ./danio_gcc.sh ${t} 32
-            sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32
-        - script: |
-            ./danio_gcc.sh ${t} 64
-            sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64
-        - stage: upload
-            script: |
-                mkdir -pv out
-                sshpass -p "${passwd}" torify rsync -Pavr ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32/* out
-                sshpass -p "${passwd}" torify ssh ${login}@${tor} rm -rvf /mnt/.sda1/travis/danio-gcc/64/* /mnt/.sda1/travis/danio-gcc/32/* 
-                rm -rf out/*.log
-            deploy:
-                provider: releases
-                api_key: ${token}
-                file_glob: true
-                file: out/*
-                on:
-                    tags: true
-                
+  include:
+  - name: gcc32
+    script: ./danio_gcc.sh ${t} 32 && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32   
+  - name: gcc64
+    script: ./danio_gcc.sh ${t} 64 && sshpass -p "${passwd}" torify rsync -Pavr out/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64
+    
+  - stage: upload
+    script: mkdir -pv out && sshpass -p "${passwd}" torify rsync -Pavr ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/64/* ${login}@${tor}:/mnt/.sda1/travis/danio-gcc/32/* out && sshpass -p "${passwd}" torify ssh ${login}@${tor} rm -rvf /mnt/.sda1/travis/danio-gcc/64/* /mnt/.sda1/travis/danio-gcc/32/* && rm -rf out/*.log
+    deploy:
+     provider: releases
+     api_key: ${token}
+     file_glob: true
+     file: out/*
+     on:
+      tags: true
+
 before_install: |
-    sudo apt update -qq
-    sudo apt install -qq -y tor rsync torsocks sshpass git-core gnupg flex bison lftp gperf m4 build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libxml2-utils xsltproc schedtool gettext texinfo
-    sudo apt-get clean
-    chmod +x -v *.sh
-    tor&
-    sleep 15
+ sudo apt update -qq
+ sudo apt install -qq -y tor rsync torsocks sshpass git-core gnupg flex bison lftp gperf m4 build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libxml2-utils xsltproc schedtool gettext texinfo
+ sudo apt-get clean
+ chmod +x -v *.sh
+ tor&
+ sleep 15