Might be an opportunity for my first pr 🤔