Commiting latest changes manually

This overwrites all files other than upload.