Vamsi's changes
Fixed, but download and upload not working properly