removed singelton pattern