We can probably simplify this with the new approach