Definitely much better solution