Fixed grouping of functions