cleaned up service calls for real this time