some more testing, before reverting most of this approach anyhow