removing that complexity would be nice :slightly_s...