Added triggers, last commit before graphic update