Reorganized final