better support for multiple uploads