finished both parts 1 and 2