I actually don't remember why I used this approach, which tells me we/I should revisit this :)