removed unnecessary function wrap