I have an idea to make this better