modified week 2 stuff