rewrote function names in camel case