Upload modification by Naveen