Week03-Week04 modification