switched to using some underscore functions