Yay, implemented second proposition! :-)