Added more triggers, cleaned up syntax