Merged with Joshua
Activity Upload Modifications