added week 30, added classes