Major Update to Final Two Modules