Week #2: improvements