Solution too plain, fancier one added