working on Upload mode now