make reuse opportunities TODO instead of nocommit