edit all method to singelton