Trying to do better 👨‍💻