Editing to fix problems from upload