Add fanciness that I'm not sure about