Took longer than I though, but at least it works now.