Improvement for my last save. NO WIFI NEEDED :D