Oof should have implemented this idea years ago