First and last, moved helpers to helper, more incidents