Makeover + exercise 3.5