added functions to 2_1 c)
merged