Module 8 Bug Fix + Module 16 Change implementation