Updated with dictify function 2