cleanup week 2 with states and added week 3