Moved some triggers, some new ones too