edited func names