Improved existing functionnalities. :)