added logger and updated underscore