I’m pretty satisfied with this new approach