More work on service