Fixing errors in new upload