Update to functions;