[BUGFIX] Followup: Move functions to GraphicalFunctions