Reorganize and extend.