UTP chapter 2, 3 and 4 updated to current situation