Git take 2, Koji's version