triggerfactory rework