Moved service here
Fixed comment