Changed service to invoke with arguments and tweaked a bit.