Final commit chp2