Finally completely working, I think.