FINAL Upload - With correctly aligned media files