BIG MERGE 12/17/13