Merge C2 week 1