Added working for week 2/3