changed func names