20141031: Updated output to match spec