Week 6

Last updated

#338:

Change request updated