Iterating the commit a bit, I think this is how it works without extra