mfarragher Update for v0.7