pulling Chris's changes
fixing merge conflicts
fixed m conflicts
deleted full_stats file