Add better solution