Merged and Updated 5/1/13