some changes. service correctly tested.