Activity 2 -- 2.1 & 2.2