oh, what did I do. such a massive rewrite – again