Upgraded to the new mod system