First revision and fix download module