2.1 and 2.2 from week 2 added