Give me a idea to make this better