ENH: updated to use new Dict(a=>b)  instead of {a=>b} syntax