Amended extension match condition
Make It Modular completed.