kept working after last commit, couldn't help myself