Chapter 3 - final commit omn