Reorganized requirements