typo and separation of services and streams