Trigger stuff

Now the commit shrunk by quite a bit :)