still fixing upload issues