updated with week 3