changed func names to what Herbert likes