updated to new Dict() syntax