Week #1: improvements