maybe the PR title is just misleading but wasn't the point of this to not use the `toplevel` anymore? also the first condition of this `if` is empty, but i can fix that