Updated .functions