updated ACP to use new functions-class