a long awaited commit, still not working