moved custom functions to config
committing old changes