reverted to old trigger system