removed self-calling of functions