This should be in the trigger listener