commit homework  4.4 + 4.5