major overhaul upload