changed services to singleton