Reorganized logic