Added better output of new style functions