Reorganized methods