Updated for UltimaMod