Revision of week 1 and week 2