A little bit better solution