dict improved, reduced mem significantly