Moved trigger order