Add some better solution