adding little logic to the status service
merge
merge