Added more triggers