deleted singleton; added  service