Not working version with file upload added