Completely rewriting the mod