intermediate changes for supporting Archived data. Moving to Baptiste Desktop...