Reorganized implementation