Adding my part to m3-duties