are we using underscore here? I wasn't sure...
if not, i guess its makes more sense to do it in a separate commit