Bug fix, waiting for services now.