Completed the current version of module_6/8