minor chages - dashed is json property names are evil