changed from always to trigger