added auto-upload capabilities