split into several files
added better triggering