Complete rewrite of the mod (Part #2)