Proper upload with figures