ok, I think this actuall works now