Redo of the main mod