Fancier and working. Tested