added Jirberts stuff to m2 duties