Reorganized + debug