converted the rest of the services to singular
they never end