Final tweak on module 8