Broken commit, but WAY faster so far