Adjusted functions