adding back auto-trigger