More work on triggers