Merged in XP listners from FactoryMod