Updated with lodash