Removed addOns to see if modules work (modules added already)